From e643a53884e9488c2ea0c5c86a4cc2799e26ded6 Mon Sep 17 00:00:00 2001 From: "iap10@freefall.cl.cam.ac.uk" Date: Wed, 6 Jul 2005 17:28:12 +0000 Subject: [PATCH] Enable CONFIG_HIGHMEM4G in default Linux 2.6 kernel configs. There seems to be little performance overhead, and its useful to a lot of people. Signed-off-by: ian.pratt@cl.cam.ac.uk --- .../arch/xen/configs/xen0_defconfig_x86_32 | 13 ++++++++----- .../arch/xen/configs/xenU_defconfig_x86_32 | 10 ++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 index b869de31c7..4df0524b23 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-xen0 -# Wed May 4 17:11:56 2005 +# Linux kernel version: 2.6.11.12-xen0 +# Wed Jul 6 18:26:29 2005 # CONFIG_XEN=y CONFIG_ARCH_XEN=y @@ -128,8 +128,9 @@ CONFIG_X86_CPUID=y # Firmware Drivers # # CONFIG_EDD is not set -CONFIG_NOHIGHMEM=y -# CONFIG_HIGHMEM4G is not set +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y +CONFIG_HIGHMEM=y CONFIG_MTRR=y CONFIG_HAVE_DEC_LOCK=y # CONFIG_REGPARM is not set @@ -146,8 +147,9 @@ CONFIG_PCI=y # CONFIG_PCI_GOMMCONFIG is not set # CONFIG_PCI_GODIRECT is not set CONFIG_PCI_GOANY=y -# CONFIG_PCI_BIOS is not set +CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y # CONFIG_PCIEPORTBUS is not set # CONFIG_PCI_MSI is not set CONFIG_PCI_LEGACY_PROC=y @@ -183,6 +185,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_FS is not set diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 index 478d412669..7813f5ec35 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.11-xenU -# Wed May 4 17:14:10 2005 +# Linux kernel version: 2.6.11.12-xenU +# Wed Jul 6 17:44:54 2005 # CONFIG_XEN=y CONFIG_ARCH_XEN=y @@ -123,8 +123,9 @@ CONFIG_X86_CPUID=y # Firmware Drivers # # CONFIG_EDD is not set -CONFIG_NOHIGHMEM=y -# CONFIG_HIGHMEM4G is not set +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y +CONFIG_HIGHMEM=y CONFIG_HAVE_DEC_LOCK=y # CONFIG_REGPARM is not set @@ -139,6 +140,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_HIGHMEM is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_FS is not set -- 2.30.2